Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 13 Jul 2011 15:43:53 +0000 (08:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 13 Jul 2011 15:43:53 +0000 (08:43 -0700)
commit96abb6357119a5bb1216ea9542b799b681cf704b
treed1f2188c7d9e4f8f33d3f236f096d5ba1400e195
parent799e28d081b5a1d1b3ef40260a923c4ba00a3dc2
parent71ae677ca347c4c9262a9bc8431dcc47e156b299
Merge from trunk.